Test against 1.5.0-RC17
Merge remote-tracking branch 'michaelklishin/patch-1'