mount option changed for new vagrant version
Merge branch 'develop'