Merge pull request #257 from antonblanchard/nofpu-fix