Merged branch master into avrorpc