Add the master branch updates to the laptop branch