Squashed commit including the following:

...microcommits omitted...

commit 200848f1274bf0bf9e9f5d1564647ee15d16145a
Author: Damian Mansilla <damian@cedexis.com>
Date:   Thu Oct 2 09:51:57 2014 -0300

    geo with overrides