Merge branch 'hotfix/2.1.4' v2.1.4
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 15 Jun 2016 20:35:16 +0000 (16:35 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 15 Jun 2016 20:35:16 +0000 (16:35 -0400)

Trivial merge