Merge remote-tracking branch 'origin/webOS-ports/master' into webOS-ports/master