+ removed stale branches, now merged into trunk
Authored by: mukau 2014-03-13
Parent: [r125]
Child: [r127]