Merge conflicts
branches: 1.2.2;Merge our changes; the directory structure got changed.Changes are too large for here, see changelog.
branches: 1.1.1;Initial revision