Merge commit '9ea923174c2daffd9b6a1cd630018d3fdfe91f62' * commit '9ea923174c2daffd9b6a1cd630018d3fdfe91f62': Rearrange some code so it makes more sense. Thanks, findbugs.
Merge commit '9ea923174c2daffd9b6a1cd630018d3fdfe91f62' * commit '9ea923174c2daffd9b6a1cd630018d3fdfe91f62': Rearrange some code so it makes more sense. Thanks, findbugs.