Fixing tomfoolery
Merge branch 'hotfix/2013.09.10.1'
Merge tag '2013.09.10.1' into develop

Fixing feature 2 tomfoolery