Add option to manually set remote variables when encountering problems
Add keyphrase support
Bump version
Merge branch 'develop'
Merged in upstream changes