Merge tag 'v1.2.10' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 22 Jun 2016 18:00:40 +0000 (14:00 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 22 Jun 2016 18:00:40 +0000 (14:00 -0400)
Version 1.2.10


Trivial merge