Initial checkin
Merge branch 'master' into vendor