Merge remote-tracking branch 'origin/master'

Conflicts:
	bridge/src/test/java/org/tiaacref/xlsreader/stac-test.xlsx