Master 1.2 merge gmeno

@jcsp 
@dmick 

The only conflicts were in README.rst
and building_packages.rst
I chose to take master as authoritative in both cases.