Fixes
Merge remote-tracking branch 'origin/master' into 2013-05-22