Merge remote-tracking branch 'origin/master'

Conflicts:
	src/IndustryClassifications.cpp
	src/test.cpp
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit a691128a21199d56a47908a5206eae4e0c171bec.