Merge "Bug 499: Added support for change listeners."