Merge branch 'master' into audio_message
Merge remote-tracking branch 'origin/master' into audio_message
Workaround for #209 (this stuff will be removed soon anyway)

Close #209.

Signed-off-by: Daniele Ricci <daniele.athome@gmail.com>
Merge branch 'master' into audio_message
Merge branch 'audio_message' into ptt_message