Syncing up the source code in this branch with master.