Merge with latest from DrupalOpenSource