Merging hotfix 2013-07-03 into master