Merge branch 'hotfix/1.3.13' v1.3.13
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 8 Jan 2016 19:33:52 +0000 (14:33 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 8 Jan 2016 19:33:52 +0000 (14:33 -0500)

Trivial merge