Merge branch 'hotfix/1.1.7'
authorSteve Sutton <ssutton@gmail.com>
Thu, 14 Apr 2016 00:08:52 +0000 (20:08 -0400)
committerSteve Sutton <ssutton@gmail.com>
Thu, 14 Apr 2016 00:08:52 +0000 (20:08 -0400)

Trivial merge