Merge branch '7.x-1.x' of https://github.com/jmtorres/drupal-storage_api into develop