Pulling in bureado's changes after resolving merge conflicts