Merge branch 'hotfix/2.1.1' v2.1.1
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 22 Feb 2017 13:06:03 +0000 (08:06 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 22 Feb 2017 13:06:03 +0000 (08:06 -0500)

Trivial merge