Merge branch 'master' into upstream

git-svn-id: http://micropolis.googlecode.com/svn/trunk@959 d9718cc8-9f43-0410-858b-315f434eb58c