Adding a line to our desktop copy
Pulling in changes in master