Merging in changes made to make release branch compile and install correctly.