Pull 4.2-dev fixes to master 05/03/2013