Merging Intermine 1.3.7 ~ Merge remote-tracking branch 'upstream/master' into mmDev