Merge branch 'master' of https://github.com/cmzmasek/forester
authorzma <zma@localhost>
Tue, 14 Feb 2017 18:19:08 +0000 (10:19 -0800)
committerzma <zma@localhost>
Tue, 14 Feb 2017 18:19:08 +0000 (10:19 -0800)

Trivial merge