Merge branch 'master' into lucene_memory