Merge branch 'release/1.0.11' v1.0.11
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 19 May 2017 17:23:15 +0000 (13:23 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 19 May 2017 17:23:15 +0000 (13:23 -0400)

Trivial merge