Fixes stylecop issues that only come up when built within Dart.
Merge remote-tracking branch 'origin/master'