Merge branch 'hotfix/24'
Merge remote-tracking branch 'refs/remotes/origin/master'