Upgrade boxen to 2.0.4
Merge remote-tracking branch 'upstream/master'