Merge remote-tracking branch 'ocramius/move-view-helpers-setup-to-module-config'