* make AMS safe for Ruby 1.8.7
Merge branch 'master' into production