Merge commit '78e502df5163e8bcdd803af7f0a3958322a288dc' * commit '78e502df5163e8bcdd803af7f0a3958322a288dc': Fix SDK build: a few things missing, a link that was wrong.
Merge commit '78e502df5163e8bcdd803af7f0a3958322a288dc' * commit '78e502df5163e8bcdd803af7f0a3958322a288dc': Fix SDK build: a few things missing, a link that was wrong.