merge conflicts
branches: 1.2.4; 1.2.8;Merge local changes, add build glue.
branches: 1.1.1;Initial revision