[galaxy-commits] commit/galaxy-central: jmchilton: Merged in martenson/galaxy-central-marten (pull request #497)