Merged 'master' into 2.0