Merge remote-tracking branch 'origin/master' into develop

Author: davej

.travis.yml

@@ -6,4 +6,4 @@ before_install:
   - "sh -e /etc/init.d/xvfb start"
   - "npm install -g bower"
   - "npm install -g gulp"
-  - "bower install"
+  - "bower install"