Preparing to merge raspberry-pi with master
Merge remote-tracking branch 'origin/master' into raspberry-pi