Refs #4234 Fix z-index of calendar so it appears on top of segment editor
Merge remote-tracking branch 'origin/master'