Initial commit
Merge remote-tracking branch 'zend/master' into mergewithzend