Defaults moved to public object (easier to reusable in many places on the site).
Merge remote-tracking branch 'origin/master'