am 3de1fe6: Merge change 1529 into donut

Merge commit '3de1fe627073608270f844714f24ed83ed4266db'

* commit '3de1fe627073608270f844714f24ed83ed4266db':
  Fix makefile to be compatible with findbugs v 1.3.8