Request branch merge with master

Please review, @casey-collab