Problems with upgrade to 3.6.3

[Eventyret]

@ajo - Sadly not still running 3.5.4 but would love to try upgrade past 3.6 at one time.