Preparing to merge raspberry-pi with master