- This is the exact contents of 4c3c87a in master. As mentioned in the
previous commit, rebasing is failing for this branch and I continue to
manually commit master changes to this branch.