Fixes #54
Merge branch 'hotfix/2014-10-26.2'