Merge tag 'v1.1.7' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 7 Oct 2016 19:21:03 +0000 (15:21 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 7 Oct 2016 19:21:03 +0000 (15:21 -0400)
Version 1.1.7


Trivial merge