Merge tag 'v1.2.6' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 16 Dec 2016 14:54:34 +0000 (09:54 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 16 Dec 2016 14:54:34 +0000 (09:54 -0500)
commitf38dcc3da4b7ba5ccb98df5ea35105487f498479
tree2ecbc9f7c3268d151d83edd26788c5f431456aed
parentb8d0505a4501fbe806452ca9b37f31c5a7ca7103
parent766b76e140815677ac365aabac89dbaecf5c3620
Merge tag 'v1.2.6' into develop

Version 1.2.6