rebase-20140926: Fix errors from conflicts resolution