Hotfix 2014-06-11

@singingwolfboy this is the hotfix branch for Wednesday