Avocado 1.0 (beta 4)
Merge remote-tracking branch 'upstream/master'