Deal with possible albacore version issue on CI box
Merge branch 'develop'