Add support for ReSharper 8.1
Merge pull request #1199 from oysteinkrog/fix_resharper_8.1

Add support for ReSharper 8.1