Merge branch 'hotfix/1250'

Close #1250
Merge remote-tracking branch 'origin/pr/1251'

Close #1251
Merge remote-tracking branch 'origin/pr/1252'

Close #1252
Add (more) line numbers to code examples in Zend Studio tutorial
Merge remote-tracking branch 'origin/pr/1254' into develop

Forward port #1254