Merge branch 'master' of defaria.com:/opt/git/clearscm
authorAndrew DeFaria <Andrew.DeFaria@Broadcom.com>
Mon, 21 Nov 2016 23:47:08 +0000 (15:47 -0800)
committerAndrew DeFaria <Andrew.DeFaria@Broadcom.com>
Mon, 21 Nov 2016 23:47:08 +0000 (15:47 -0800)

Trivial merge