Merge branch 'hotfix/1.2.35' v1.2.35
authorIan Weller <ian@gaslightmedia.com>
Tue, 27 Dec 2016 20:38:31 +0000 (15:38 -0500)
committerIan Weller <ian@gaslightmedia.com>
Tue, 27 Dec 2016 20:38:31 +0000 (15:38 -0500)

Trivial merge