Merge tag 'v1.1.7' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 6 Sep 2016 12:10:40 +0000 (08:10 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 6 Sep 2016 12:10:40 +0000 (08:10 -0400)
Version 1.1.7


Trivial merge