This makes version 6.7 the same on both branches. Some of the previous versions (6.2-6.6) on
master were missing commits that existed on develop.
Note: 6.7 was released on develop. It should have been done on master, but at least it has
resulted in the missing commits getting to master.
