getting rid of dependency on webcore
Merge remote-tracking branch 'origin/master'