removed java/nio/charset/StandardCharsets import to make implementation compatible to java VMs prior 1.7
Merge remote-tracking branch 'forked/scm-updates'