Merge branch 'hotfix/1.2.37' v1.2.37
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 28 Dec 2016 15:21:53 +0000 (10:21 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 28 Dec 2016 15:21:53 +0000 (10:21 -0500)
commit86e410e4d666924df4671256d0d2816475755a4e
treeb3525d43d0ab45adfc5ecc1cd2f18cc6276c8ff3
parent568a21208c3c526e14d23fd5143171983b6ed225
parentae4b0daaf6ea1ece974104e011299b44def27a39
Merge branch 'hotfix/1.2.37'