Merge branch 'release/1.0.21' v1.0.21
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 17 Mar 2015 13:57:02 +0000 (09:57 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 17 Mar 2015 13:57:02 +0000 (09:57 -0400)

Trivial merge