Merge branch 'flattr'