Merge branch 'develop' into ldt

modules/base/pymod/table.py

modules/base/src/string_ref.hh

modules/base/tests/test_table.py

modules/conop/pymod/CMakeLists.txt

modules/conop/pymod/export_non_standard.cc

modules/conop/pymod/wrap_conop.cc

modules/conop/src/CMakeLists.txt

modules/conop/src/nonstandard.cc

modules/conop/src/nonstandard.hh

modules/conop/tests/CMakeLists.txt

modules/conop/tests/test_nonstandard.py

modules/conop/tests/testfiles/cbeta.pdb

modules/conop/tests/testfiles/sep.pdb

modules/img/alg/tests/test_stat.cc

modules/io/pymod/wrap_io.cc

modules/io/src/mol/pdb_reader.cc

modules/io/tests/test_io_pdb.cc

modules/io/tests/testfiles/pdb/1oax.pdb

modules/io/tests/testfiles/pdb/2p6a.pdb

modules/mol/base/tests/test_ics.cc