Fix 5.4 build
prepare for 1.2.1
back to dev 1.3.0-dev
Merge remote-tracking branch 'laruence/master'