Commit for Mint 17
Commit for move to Mint 17