Checkout and merge between 9bd9320e24 and 053c0664f7

Checked out and merged the two commits.
Note to self: git checkout -p <hash>