Merge remote-tracking branch 'upstream/master' to use new beagleJS web service