hotfix-2013-11-08 merge back to master

This reverts commit 6cb5c3900f761b66814a2410a34b1c43c46554c1.