Updates for 2012-05-03

American Beaver