Hopeful fix for FB 5201
Merge pull request #165 from unwin/develop+fb5201

Hopeful fix for FB 5201