Merge branch 'hotfix/1.5.4' v1.5.4
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 27 Jan 2017 18:52:11 +0000 (13:52 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 27 Jan 2017 18:52:11 +0000 (13:52 -0500)
commitfd14db94b08410528475d72f9dd4e7593e930303
tree8c5cdb88a58ed595536eab51179134ef26224536
parent2d54ca14fb5c61fc34140e613952a0db8d3fe9a5
parent2ade8052244e546c97290d2a83e6906618176b5f
Merge branch 'hotfix/1.5.4'