Merge branch 'hotfix/1.1.13' v1.1.13
authorIan Weller <ian@gaslightmedia.com>
Fri, 14 Apr 2017 13:03:56 +0000 (09:03 -0400)
committerIan Weller <ian@gaslightmedia.com>
Fri, 14 Apr 2017 13:03:56 +0000 (09:03 -0400)

Trivial merge