Manual merge from https://github.com/imalberto/photonews/pull/7

/ping @caridy