Merge tag 'v1.2.16' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 7 Jul 2016 18:44:13 +0000 (14:44 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 7 Jul 2016 18:44:13 +0000 (14:44 -0400)
Version 1.2.16


Trivial merge