Merge branch 'hotfix/1.2.13' v1.2.13
authorIan Weller <ian@gaslightmedia.com>
Fri, 18 Nov 2016 15:51:44 +0000 (10:51 -0500)
committerIan Weller <ian@gaslightmedia.com>
Fri, 18 Nov 2016 15:51:44 +0000 (10:51 -0500)

Trivial merge