change on dev from parent
change on dev from child
Merge commit '730c9c4eac09df3c6ec008c23f1bbe8f1e092f22' into develop

Conflicts:
	sub/README.md
Adding a change from dev, on child, after parent released.
Merge commit '88acd18a26eef56aa10d2a16ae4d84c8ea771b0e' into develop

Conflicts:
	sub/README.md