Data dir may contain user_xsl folder which should not be ignored.
Merge remote-tracking branch 'origin/develop' into develop