Merge proposals dependent on lp://staging/~chrisccoulson/gnome-python-extras/with-gda-module

1. with-gda-module
2. Dependent merge proposals