last commit backported to 3.2 branch
last commit backported to 3.2 branch

BookingBug/active_scaffold,BookingBug/active_scaffold,asoltys/active_scaffold,silverpond/active_scaffold,silverpond/active_scaffold,silverpond/active_scaffold,BookingBug/active_scaffold,asoltys/active_scaffold