Merge remote-tracking branch 'origin/master'

# Conflicts:
#	tools/biotransformer/biotransformer.xml
#	tools/biotransformer/wrapper_biotransformer.py
#	tools/retip/macros.xml
#	tools/retip/retip_apply.xml
#	tools/retip/retip_descriptors.xml