Merge branch 'v2' into issue224.

Merge v2 ignoring changes so we can then pull this back into v2.

Essentially we are reverting v2 one commit, and then replaying our commit.

Author: adobeDan