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

2014-10-26.2 hotfix