Fixes #274
Prepare for 1.5
Merge remote-tracking branch 'upstream/master'
Missed removing unused binary images on last commit