Merge branch 'hotfix/2.1.7' v2.1.7
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 20 Jun 2016 12:44:49 +0000 (08:44 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 20 Jun 2016 12:44:49 +0000 (08:44 -0400)
commit37f88b296262ef00162c72fe5af9872678168014
tree75b53e4bdda526abbc37ca0d56b9d02629a3ef51
parent7b7cbfa9fa8b8b957a77be6a9ed6d219a16a1f5f
parentd2176b542c8107d3fe68f5f5c9e1e9c229e72f36
Merge branch 'hotfix/2.1.7'