2.0.5 PR - See changelist for details
Fixup Sign #ifdefs
Merge pull request #184 from joeg/dev

  2.0.5 PR - See changelist for details