Merge tag 'v1.0.36' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 26 Oct 2015 20:26:49 +0000 (16:26 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 26 Oct 2015 20:26:49 +0000 (16:26 -0400)
updated to 1.0.36


Trivial merge