Merge branch 'hotfix/1.0.20' v1.0.20
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 13 Mar 2015 16:48:47 +0000 (12:48 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 13 Mar 2015 16:48:47 +0000 (12:48 -0400)

Trivial merge