Bumped version to 1.5.4.2
Merge branch 'dev' into test