Merge branch 'release/1.2.16' v1.2.16
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Dec 2017 13:09:35 +0000 (08:09 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Dec 2017 13:09:35 +0000 (08:09 -0500)

Trivial merge