Merge "Bug 117"