REVERT ME
Fix up conditional derps
Merge branch 'master' into monodroid-support
Project Fixups