Coding style, using latest Zephir
Merge remote-tracking branch 'upstream/2.0.0' into 2.0.0