Updated to speed up GWT compilation