One-off patch #1
One-off patch #2
Set version to 1.1
Update config file with new greeting
Merge branches 'p1' and 'p2' into 1.x