Merge tag 'v1.1.7' into develop
authorSteve Sutton <ssutton@gmail.com>
Thu, 14 Apr 2016 00:09:00 +0000 (20:09 -0400)
committerSteve Sutton <ssutton@gmail.com>
Thu, 14 Apr 2016 00:09:00 +0000 (20:09 -0400)
Version 1.1.7


Trivial merge