Backwards merge of raspberrypilearning commits