Merge tag 'v1.2.10' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 29 Sep 2016 18:36:24 +0000 (14:36 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 29 Sep 2016 18:36:24 +0000 (14:36 -0400)
Version 1.2.10


Trivial merge