Merge commit '52cde7279bad58285704498eea57bdaf9e595b49' into eclair-mr2 * commit '52cde7279bad58285704498eea57bdaf9e595b49': Fix docs builds.
Merge commit '52cde7279bad58285704498eea57bdaf9e595b49' into eclair-mr2 * commit '52cde7279bad58285704498eea57bdaf9e595b49': Fix docs builds.