Merge "Fix bug in MacAddress.fromString()"