am 8d960cfe: Merge "Alpha addresses get put in the same thread" into gingerbread

* commit '8d960cfe99129476d87ca0886e56b0717b4a6590':
  Alpha addresses get put in the same thread