Merge remote-tracking branch 'joel/master' into mymerge

Change-Id: I06506cff55f261badd394abc2b23a8dc15ce7dce