Merge branch 'release/1.0.18' v1.0.18
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 15 Nov 2016 15:25:39 +0000 (10:25 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 15 Nov 2016 15:25:39 +0000 (10:25 -0500)

Trivial merge