Build #39:   Merge branch 'master' into alpha on branch alpha over 5 years ago