Merge pull request #1407 from Areloch/Companion_PR_1398v3.8-rc
commit82bafd9f35ac43df6710a6e90e580a9a089895e2
authorAreloch <areloch@gmail.com>
Sat, 5 Sep 2015 17:08:39 +0000 (5 12:08 -0500)
committerAreloch <areloch@gmail.com>
Sat, 5 Sep 2015 17:08:39 +0000 (5 12:08 -0500)
tree9198c5bfe6b2593be2ad716e06521486d9651472
parentec2da8c1c84a9ead72ffce095343c8cb66031933
parentdd5f910b64236a3a1b13e8027a742b1ca63ffad5
Merge pull request #1407 from Areloch/Companion_PR_1398

Companion PR to 1398