Fix build server issues with BCL
Merge branch 'master' of https://github.com/stormid/storm-googleanalytics-reporting