Merge branch master with protractor-tests