[galaxy-commits] [galaxyproject/galaxy] 6e13c3: Cherry-picked changes from pull request #1392.