Merge branch 'hotfix/1.5.3' v1.5.3
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 29 Sep 2016 18:32:19 +0000 (14:32 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 29 Sep 2016 18:32:19 +0000 (14:32 -0400)
commitb91cecd92860fa35adefa7475e14975cf2558fa5
tree1a1c26afbd4014a6a0fb67c148bb9cc8c0a45e0d
parent1644e138aa4099c34ea98ad7b09e6216a3f1fdac
parent9de2eee5fd8f6a47ec54582a8c07cd61452a860e
Merge branch 'hotfix/1.5.3'