Merge tag 'v1.6.15' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 2 Mar 2017 20:31:22 +0000 (15:31 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 2 Mar 2017 20:31:22 +0000 (15:31 -0500)
Version 1.6.15


Trivial merge