Canada v2.1

@thriuin this needs some review so I won't merge right away. I merged in two steps, once for the 2.1.2 release: wardi@752ac37 and again for 2.1.3