am 43ef013c: (-s ours) am 38f7dcd7: DO NOT MERGE. Test for Configuration...
am 43ef013c: (-s ours) am 38f7dcd7: DO NOT MERGE. Test for Configuration differences before changing.
* commit '43ef013c':
DO NOT MERGE. Test for Configuration differences before changing.