Merge branch 'hotfix/1.3.10' v1.3.10
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 7 Jan 2016 19:54:23 +0000 (14:54 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 7 Jan 2016 19:54:23 +0000 (14:54 -0500)

Trivial merge