AAARGH LMR!
Merge remote-tracking branch 'fluffyfreak/fixbug1928'