pull from stable branch for flickrex