Correction in setup.py: do not raise exception if install location does not exist yet.
Merge remote-tracking branch 'upstream/develop' into develop