Limited to build master branch only.
Merge branch 'master' into issue_#6