Merge mga-1-0-0-branch into trunk.