Merged in changes from branch amerish.