Merge branch 'photo_album'
Merge branch 'master' into photo_album