15 x candidate

Merge all 1.4 and 1.5 changes into master branch