reintegrating amitran branch into trunk

git-svn-id: http://svn.code.sf.net/p/sumo/code/trunk/sumo@16170 29f149b2-0c63-11e1-8f5c-a347f6a9acd0
Merge branch 'master' into planet