merged in changes from protractor branch