Template-ize the top bar navigation.
More robust client-side job failure detection.
Merge remote-tracking branch 'upstream/master'