Merge tag 'v1.2.15' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 28 Dec 2016 18:10:38 +0000 (13:10 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 28 Dec 2016 18:10:38 +0000 (13:10 -0500)
Version 1.2.15


Trivial merge