Merge tag 'v1.5.6' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 4 Jan 2017 16:21:12 +0000 (11:21 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 4 Jan 2017 16:21:12 +0000 (11:21 -0500)
Version 1.5.6


Trivial merge