Merge from upstream browndav/medic-os:master