https://github.com/CodeSleeve/asset-pipeline/issues/69
Merge branch 'testing'