Build with ES 6

Dmitry Shachnevrequested to merge
es6 into master

Closes: #1068693.

Maybe this fix is not perfect, but it seems to fix the bug.

Merge request reports