merge develop -D org

Repository: ome/scripts
Updating 1878321..356b81f
Merged PRs (fast-forward):
  # PR 73 sbesson 'Fix scripts to comply with PEP8 1.5.0 (rebased onto develop)'

Generated by OMERO-5.1-merge-push#123 (http://ci.openmicroscopy.org/job/OMERO-5.1-merge-push/123/)