Merge branch 'hotfix/2.1.17' v2.1.17
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 6 Jul 2016 13:17:18 +0000 (09:17 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 6 Jul 2016 13:17:18 +0000 (09:17 -0400)

Trivial merge