Merge remote-tracking branch 'origin/master'

Conflicts:
src/class_receiveDataThread.py