Merge remote-tracking branch 'refs/remotes/koush/master' into jb-4.2
Signed-off-by: travp624 <travp624@gmail.com>