gbgg/aama — pull request #2 by gbgg (2013-06-28 13:49:39+00:00)
Title: Masterclone

Merge with masterclone to get back to original master