Merge pull request #1518 from blckmn/simplified_owners