Merge branch 'release/0.3.5' v0.3.5
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 12 Jan 2016 15:30:42 +0000 (10:30 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 12 Jan 2016 15:30:42 +0000 (10:30 -0500)

Trivial merge