Version 1.1.4.0
Merge remote-tracking branch 'origin/dev'