Merge commit '29f28cfe2188179519094e35d7fad09588170e88' * commit '29f28cfe2188179519094e35d7fad09588170e88': Fixed api/current.xml after a bad merge.
Merge commit '29f28cfe2188179519094e35d7fad09588170e88' * commit '29f28cfe2188179519094e35d7fad09588170e88': Fixed api/current.xml after a bad merge.