Backported r2171 from trunk.
Backported r2170 from trunk.
Merged r2168 and r2169 from trunk.
Merged r2143 and r2144 from trunk.
Merged r1930 from trunk.
Merged r2168 to r2171 from trunk.
Validates sort_key and sort_order params (#2378).
Escape textile titles and styles (#2377).
Escape query names (#2379).
Escape wiki annotate lines content (#2380).