Baggz/Amanda — pull request #75 by honzajavorek (2014-05-06 18:40:47+00:00)
Title: Upstream sync

Attempt to sync the repo with upstream.