DRUPAL-5--1-1--dev
a9f205f6 · #192117 - Based on raymondlee's fix, and cleaning up the logic a bit to make... ·