Merge branch 'hotfix/1.1.6' v1.1.6
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 29 Jun 2016 18:50:18 +0000 (14:50 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 29 Jun 2016 18:50:18 +0000 (14:50 -0400)

Trivial merge