Merge remote-tracking branch 'origin/master' into ByteBufferRead

Conflicts:
	parquet-column/src/main/java/parquet/column/values/dictionary/DictionaryValuesReader.java
	parquet-hadoop/src/main/java/parquet/hadoop/ParquetFileReader.java