Merge remote-tracking branch 'fiocfun/toypics-support'