Switch for masking test run
Merge branch 'master' into gh-pages