Re-rolled patch #61, Attched interdiff for same. Added missing dialog.es6.js ...