Merge "Update to bugreportz" into oc-dev