Merge tag 'v1.0.21' into develop
authorIan Weller <ian@gaslightmedia.com>
Tue, 27 Dec 2016 21:26:37 +0000 (16:26 -0500)
committerIan Weller <ian@gaslightmedia.com>
Tue, 27 Dec 2016 21:26:37 +0000 (16:26 -0500)
version 1.0.21


Trivial merge