Changed the language level to 6.0, so Macs can use our tool.
Merge remote-tracking branch 'origin/master'