Merge "Tweak error message for compiler compliance with 1.7" into idea133
 Auto-merge: ea4d17d

* commit 'ea4d17d1fe2d12e917fc9406255cc7b3826ad95e':
  Tweak error message for compiler compliance with 1.7