Merge remote-tracking branch 'patched-for-1.5/patch-1'