Merge branch 'hotfix/1.5.24' v1.5.24
authorIan Weller <ian@gaslightmedia.com>
Wed, 18 May 2016 17:59:35 +0000 (13:59 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 18 May 2016 17:59:35 +0000 (13:59 -0400)
commitabc3e724f29232837e61e193f9bde02097827a73
treed9bb14632bd1f341f1142dd274e11e2be35854c5
parentc3d92093e292269e2854b6df38670f00582dec8a
parentaee02df049014ccd9408da23719eb262fce82c53
Merge branch 'hotfix/1.5.24'