Merge pull request #475 from sbesson/rebased/develop/scc_0.3.10

Scc 0.3.10 (rebased onto develop)
merge develop -D org -I include -E exclude: PR 450 (omero: Python 2.6 is the minimum supported version)