The merge party is over, you may now double-check that everything is in place. PR: EJABP-1 SVN Revision: 1830