Merge pull request #3341 from awakecoding/xcrush_fix
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 12 May 2016 18:38:23 +0000 (14:38 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Thu, 12 May 2016 18:38:23 +0000 (14:38 -0400)
proper xcrush context reset fix


Trivial merge