Fixing tomfoolery
Merge branch 'hotfix/2013.09.10.1'