Merge branch 'master' into openload-phantomjs-method