Merge this by manually copying from master branch aka "I want a *native* package"!