removed xdebug options which cause segfault. need to investigate.
Merge branch 'develop'