Issue #1276908 by jessebeach, nod_, moshe weitzman, lewisnyman, webchick...

pr for https://drupal.org/node/1276908

(take 2)