Merge tag 'v1.0.21' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 14 Jan 2016 21:41:19 +0000 (16:41 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 14 Jan 2016 21:41:19 +0000 (16:41 -0500)
Version 1.0.21


Trivial merge