Merge branch 'release/1.0.12' v1.0.12
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 19 May 2017 18:05:53 +0000 (14:05 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 19 May 2017 18:05:53 +0000 (14:05 -0400)

Trivial merge