Merge branch 'hotfix/1.1.16'
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 26 Aug 2015 15:45:11 +0000 (11:45 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 26 Aug 2015 15:45:11 +0000 (11:45 -0400)

Trivial merge