Merge pull request #672 from domcleal/architecture-fact