Updated for ReSharper 8.0 RTM