Commit 75b2199f264f42de814528ccf4bfd2ef427665b5

Anthony Green 2014-12-12T10:13:56

Merge pull request #157 from rth7680/x86 Two fixes for x86