Merge pull request #4628 from timstanley1985/master

Fix build on RPi.  Building from source timesout on karma tests so increase timeouts

karma.conf.js

@@ -24,9 +24,10 @@ module.exports = function(config) {
     logLevel: config.LOG_INFO,
     logLevel: config.LOG_INFO,
     autoWatch: true,
     autoWatch: true,
     browsers: ['PhantomJS'],
     browsers: ['PhantomJS'],
-    captureTimeout: 2000,
+    captureTimeout: 20000,
     singleRun: true,
     singleRun: true,
-    autoWatchBatchDelay: 1000,
+    autoWatchBatchDelay: 10000,
+    browserNoActivityTimeout: 60000,
 
 
   });
   });