* update to 1.2.5 * remove upstream merged patches Signed-off-by: Andy Walsh <andy.walsh44+github@gmail.com>