Merged scons/scons into default
authorWilliam Deegan <bill@baddogconsulting.com>
Thu, 31 Aug 2017 18:41:28 +0000 (11:41 -0700)
committerWilliam Deegan <bill@baddogconsulting.com>
Thu, 31 Aug 2017 18:41:28 +0000 (11:41 -0700)

Trivial merge