Try to avoid a ConcurrentModificationException serializing subBuilds.
Merge branch 'master' into CME
Merge pull request #33 from jglick/CME

Try to avoid a ConcurrentModificationException serializing subBuilds.