Copying revision 22811 of greenstone2 into the 2.83-dlc-licensed tag, since this is the basis of the gs2-core module we (DL Consulting) are licensing.