Merge branch 'master' into columnfamilies

doc/index.html

@@ -779,9 +779,9 @@ implementation.  See <code>rocksdb/util/env_posix.h</code> for an example.
 <p>
 To be able to efficiently tune your application, it is always helpful if you
 have access to usage statistics. You can collect those statistics by setting
-<code>Options::table_stats_collectors</code> or
+<code>Options::table_properties_collectors</code> or
 <code>Options::statistics</code>. For more information, refer to
-<code>rocksdb/table_stats.h</code> and <code>rocksdb/statistics.h</code>.
+<code>rocksdb/table_properties.h</code> and <code>rocksdb/statistics.h</code>.
 These should not add significant overhead to your application and we
 recommend exporting them to other monitoring tools.