Updated master to latest gh-branches updates.