Merge branch 'release/2.1.16' v2.1.16
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 5 Jul 2016 20:12:07 +0000 (16:12 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 5 Jul 2016 20:12:07 +0000 (16:12 -0400)

Trivial merge