Merge branch 'release/1.0.36' v1.0.36
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 26 Oct 2015 20:26:39 +0000 (16:26 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 26 Oct 2015 20:26:39 +0000 (16:26 -0400)

Trivial merge