Corrected docblock formatting, and renamed $sort_flags to $options
Merge pull request #2867 from JamShady/pull-request/collection-sortBy-flags

Added sort flag to Collection::sortBy()
Merge remote-tracking branch 'framework/4.0' into 4.0