--HG--
branch : last_from_site
extra : convert_revision : svn%3A3132c696-2579-4545-bfe7-e0852c457502/branches/last_from_site%405
Andrew's changes base branch

--HG--
branch : last_from_Andrew
extra : convert_revision : svn%3A3132c696-2579-4545-bfe7-e0852c457502/branches/last_from_Andrew%4018
Merged Andrew changes (not all changes are incorporated, only those not implemented already, as the result project does not compile)

--HG--
branch : last_from_Andrew
extra : convert_revision : svn%3A3132c696-2579-4545-bfe7-e0852c457502/branches/last_from_Andrew%4019