My local source repo is not up-to-date :(, Update to resolve the
conflict with newest master.