Merge branch 'release/1.1.12' v1.1.12
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 21 Mar 2017 13:05:39 +0000 (09:05 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 21 Mar 2017 13:05:39 +0000 (09:05 -0400)

Trivial merge