Merge upstream master

Update ePublishing's master branch with commits to upstream master.  This incorporates a needed fix for client sites for photo uploading.