Merge tag 'v1.2.21' into develop
authorIan Weller <ian@gaslightmedia.com>
Fri, 24 Mar 2017 20:40:29 +0000 (16:40 -0400)
committerIan Weller <ian@gaslightmedia.com>
Fri, 24 Mar 2017 20:40:29 +0000 (16:40 -0400)
version 1.2.21


Trivial merge