Merge tag 'v1.6.21' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 6 Mar 2017 20:09:57 +0000 (15:09 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 6 Mar 2017 20:09:57 +0000 (15:09 -0500)
Version 1.6.21


Trivial merge