Merge origin/master.
Merge branch 'master' of https://github.com/atsticks/FXOne.git