Stop firing off timeouts when there is an empty attribute.  For one thing it really upsets protractor.
Merge remote-tracking branch 'origin/master'