Initial commit
Conflicts with zend/master resolved