Rollback 'merge with master' commit - Update boilerplate/AUTHORS/LICENSE/NOTICE