Stable 30/09

Signed-off-by: Eric <mr.waideman@gmail.com>