Merge "Update felix SVN to 30" into udc-qpr-dev