Merge now-stable code in to medic/medic-os:master