Merge commit '109b21bab5a9eb6c17e067b11784ade36129f24f' * commit '109b21bab5a9eb6c17e067b11784ade36129f24f': Findbugs fixes.