Merge tag 'v2.9.6' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 2 Feb 2017 16:49:02 +0000 (11:49 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 2 Feb 2017 16:49:02 +0000 (11:49 -0500)
commitb3bec9b1bb983f5b6803e9e969a0a1a373c66678
tree8344c8647db0a7732abd6b42028f91df8edfd2e8
parentc2b5bdb286270fda5513f539676efb9070fe8fc0
parent877c2c0feef7dd41bf09e5d7f5c77a30ab58031c
Merge tag 'v2.9.6' into develop

Version 2.9.6