Merge branch 'master' into protractor