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

Trivial merge