Merge branch 'hotfix/1.5.13' v1.5.13
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 4 May 2017 17:16:08 +0000 (13:16 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 4 May 2017 17:16:08 +0000 (13:16 -0400)
commit9e02ba9224cfb67e5012ccd91414d20d379e4eb5
treead69e249dd8a5c810c6f1eaa4be1922c3fbec6fd
parentd529d0389fe1deacb672a9a43bda61cf67974a98
parentf20c14cdf919fe66f97fe2fc3df5a946929e39fa
Merge branch 'hotfix/1.5.13'