Bug #3390 - Add full directory path to error
Merge branch 'master' of github.com:mozilla/butter