Update to latest commit.
While there, add some placeholders for things to change when a new branch gets there.
Sponsored by: Absolight