We should add the latest updates from this branch before merging the master branch with anything else.
master