Copying files from http://git.drupal.org/sandbox/skilip/1457974.git