Merge remote-tracking branch 'origin/master'

# Conflicts:
#	me_test_app/resources/MeTest.py
2 jobs for 0.0.7 in 6 minutes and 22 seconds (queued for 1 second)
latest