FYI -- I'll be pushing a 1.6.1-SNAPSHOT branch tonight.
As we finalize things in 1.6.0 that are also in previous versions (bug fixes), make sure you don't merge 1.5.1-SNAPSHOT directly into 1.6.0-SNAPSHOT anymore. You'll need to merge into 1.6.1-SNAPSHOT and cherry-pick into 1.6.0-SNAPSHOT (where applicable, of course).
