Update to magma Jun-15-2014

Signed-off-by: Shahbaz Youssefi <ShabbyX@gmail.com>