Merge branch 'hotfix/1.5.11' v1.5.11
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 7 Apr 2017 14:37:34 +0000 (10:37 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 7 Apr 2017 14:37:34 +0000 (10:37 -0400)
commitcf9f39e5ddd067c919b686fe3471fbbe32444c6a
treef453b167cee6e49e5004e31626c60c5fa20c62c6
parent5afa3d343c6ffbc404e5021a8cfcf085cad8991e
parentb0fd9a59e2390435318ba25cf94feba70ea33f72
Merge branch 'hotfix/1.5.11'