* Merged with branch github/master