Stabilize develop branch

so we can push it to master

(from redmine: created on 2013-05-05, closed on 2013-07-01, relates #1627 (closed), precedes #2402 (closed), precedes #2474 (closed))