Commit 5b9c63c3f673cbc209e53627be2a0e87c17ccb3c

Edward Thomson 2015-11-20T19:01:42

recursive merge: add a recursion limit