Merge pull request #889 from sylus/master

Upstream updates from Panopoly
Updates to WET core.
Merge pull request #14 from sylus/master

Updates to WET core.