cloudkeep/barbican — pull request #394 by dmend (2014-01-03 18:11:40+00:00)
Title: Upstream changes from master

Upstream changes from master branch.