Merged scons/scons into default
authorRichard W <garlicbready@googlemail.com>
Tue, 1 Aug 2017 13:50:41 +0000 (14:50 +0100)
committerRichard W <garlicbready@googlemail.com>
Tue, 1 Aug 2017 13:50:41 +0000 (14:50 +0100)

Trivial merge