Merge tag 'v1.2.10' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 7 Oct 2016 18:58:30 +0000 (14:58 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 7 Oct 2016 18:58:30 +0000 (14:58 -0400)
Version 1.2.10


Trivial merge