Merged in changes from RRP's firmware 0.84