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

Avocado 1.0 (beta 3)