hand add SteveMartino changes: https://github.com/huit/AWS-HA-Drupal/pull/4