punt merge conflicts
Merge branch 'xremix-translation-and-flickr'