Dirty dependency hack to allow installation with older portage snapshots
Merge branch 'develop'