Merge branch 'release/1.0.21' v1.0.21
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 27 Feb 2017 20:16:05 +0000 (15:16 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 27 Feb 2017 20:16:05 +0000 (15:16 -0500)

Trivial merge