Update to upstream (July 11 2013)

Signed-off-by: Alec Ari <neotheuser@ymail.com>
Merge branch 'magma'