Merge git://git.imendio.com/sven/giggle