Merge branch 'hotfix/1.5.5' v1.5.5
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 14 Nov 2016 20:38:11 +0000 (15:38 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 14 Nov 2016 20:38:11 +0000 (15:38 -0500)
commita23ac86b5ef928d04d106acaecc2e2c04cce77b3
treee5549216a7ab202e49b22928f1d6ef4d29efa1bb
parentb8ad205d7b360f36b5a3063a1a89b4059040a34b
parent8f4cde79abd5459de4a77e5d150978db46dba6a5
Merge branch 'hotfix/1.5.5'