Merge branch 'master' of andrew@defaria.com:/opt/git/clearscm.git
authorAndrew DeFaria <Andrew.DeFaria@Broadcom.com>
Wed, 1 Feb 2017 02:20:17 +0000 (18:20 -0800)
committerAndrew DeFaria <Andrew.DeFaria@Broadcom.com>
Wed, 1 Feb 2017 02:20:17 +0000 (18:20 -0800)

Trivial merge