Merge "Packaging resources depending on resolution" into devel/master