Don't use object.hasOwnProperty because, you know... prototypal inheritance
Merge remote-tracking branch 'origin/master'