remove automounthttp option; use generic url now
Merge origin/master