Disable the cache system (not compatible with the new version of vagrant)
Update modules
Merge branch 'master' into solr-1.3.x