Version 1.2.4.
Merge branch 'master' into 2.1
Version 1.2.4-2.1.
App version is 1.2.4-2.1