Updated to run on GWT and newest nightly