Merge GitHub Master into Drupal Dev Branch