Fixed screwed up doc block on previous commit
Code style
Merge remote-tracking branch 'origin/development' into feature-ajax2