Merge branch 'release/1.3.5' v1.3.5
authorChuck Scott <cscott@gaslightmedia.com>
Fri, 2 Sep 2016 16:46:11 +0000 (12:46 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Fri, 2 Sep 2016 16:46:11 +0000 (12:46 -0400)

Trivial merge