Hopeful fix for FB 5201
Merge pull request #164 from unwin/2014.08+FB5201

Hopeful fix for FB 5201