Avocado 0.4 beta (installer only)
Merge remote-tracking branch 'upstream/master'

0.4 beta