bumped version to 1.5-DEV
Merge branch '1.4' into 1.5
Merge branch '1.4' into 1.5