Merge master into 1.0 - bug fix configurable

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Phpspec specification passes: yes
Checkstyle issues: no
ChangeLog updated: yes
Fixes the following issue: