Merge branch 'hotfix/1.2.21' v1.2.21
authorIan Weller <ian@gaslightmedia.com>
Fri, 24 Mar 2017 20:39:58 +0000 (16:39 -0400)
committerIan Weller <ian@gaslightmedia.com>
Fri, 24 Mar 2017 20:39:58 +0000 (16:39 -0400)

Trivial merge