Renamed to v1542.sh, since we are now on the 1.5.4.2 cycle.
Merge branch 'dev' into test