Merge branch 'hotfix/1.0.17' v1.0.17
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Aug 2014 20:10:40 +0000 (16:10 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Aug 2014 20:10:40 +0000 (16:10 -0400)

Trivial merge