Merge branch 'release/20131112'
HOT FIX
Merge branch 'hotfix/20131112.1' into develop