Waffle compilation

This is more a problem for Waffle but if anyone can help me resolve the bug for them I'd appreciate any help: https://github.com/EthWorks/Waffle/issues/432

I get the following error when compiling contracts that reference OpenZeppelin contracts:

Error: None of the sub-resolvers resolved "../../GSN/Context.sol" location.