Copied over newer changes to Resources from www-generator