Merge branch 'master' into 3.7.0.D-20130322142244