Merge "Add alanstokes as an owner." into pi-dev