Align with vulcano (May 8 2013)

Signed-off-by: Alec Ari <neotheuser@ymail.com>