Merge proposals dependent on lp://qastaging/~karllinuxtest-relton/gnome-activity-journal/karl1

1. karl1
2. Dependent merge proposals