Add failing merge with defaults test
Merge pull request #11 from documentcloud/master

上游合并