Reorder file property merging; applied patch @ https://drupal.org/node/2066275
Merge pull request #3 from cha0s/master

Reorder file property merging; applied patch @ https://drupal.org/node/2...