An analysis of atmospheric neutrino data from all four run periods of Super-Kamiokande optimized for sensitivity to the neutrino mass hierarchy is presented. Confidence intervals for
Δ
m
2
32
,
sin
2
θ
23
,
sin
2
θ
13
and
δ
C
P
are presented for normal neutrino mass hierarchy and inverted neutrino mass hierarchy hypotheses, based on atmospheric neutrino data alone. Additional constraints from reactor data on
θ
13
and from published binned T2K data on muon neutrino disappearance and electron neutrino appearance are added to the atmospheric neutrino fit to give enhanced constraints on the above parameters. Over the range of parameters allowed at 90% confidence level, the normal mass hierarchy is favored by between 91.9% and 94.5% based on the combined Super-Kamiokande plus T2K result.