Merge branch 'hotfix/1.2.17' v1.2.17
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 7 Jul 2016 19:47:36 +0000 (15:47 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 7 Jul 2016 19:47:36 +0000 (15:47 -0400)
commit2693bba162e3b27d25598c5193dddb6582ddc688
treeb7959c95a885382837bfae4c85cd4c921da9851f
parent500f3385787cb3f46d1ffe1bd1ba287546e053d4
parent1979313f2bc10976dbe1514f4aa4b9add076c319
Merge branch 'hotfix/1.2.17'