Don't mark <+ rules as non-monotonic.
Merge branch 'master' into gc-proto-v1