Merge branch 'master' into telescience-v0.2