Merge latest stable code up to medic/medic-os:{dev,master}