drupal 8 support, php 5.4 etc
Merge remote-tracking branch 'github/master'