...
Merge remote-tracking branch 'origin/jb2' into jb2
Merge remote-tracking branch 'origin/jb2' into jb2
Merge commit '33544b882fb3b56602bbb02d2e6e80dd790457be' into kitkat