In-Portal

Checkout
Alex
committed
16195
on 19 May 15
Merge of "in-portal/branches/5.2.x@16189" to "in-portal/branches/5.3.x@16188".