Merge tag 'v1.2.36' into develop
authorIan Weller <ian@gaslightmedia.com>
Tue, 27 Dec 2016 20:44:07 +0000 (15:44 -0500)
committerIan Weller <ian@gaslightmedia.com>
Tue, 27 Dec 2016 20:44:07 +0000 (15:44 -0500)
version 1.2.36


Trivial merge