Updated nightly branch to sync with Master branch.