Merge branch 'hotfix/1.2.36' v1.2.36
authorIan Weller <ian@gaslightmedia.com>
Tue, 27 Dec 2016 20:43:40 +0000 (15:43 -0500)
committerIan Weller <ian@gaslightmedia.com>
Tue, 27 Dec 2016 20:43:40 +0000 (15:43 -0500)

Trivial merge