Merge tag 'v2.1.16' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 5 Jul 2016 20:12:20 +0000 (16:12 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 5 Jul 2016 20:12:20 +0000 (16:12 -0400)
Version 2.1.16


Trivial merge