End of various improvements#5

Merged

GerZah merged 5 commits intoGerZah:masterfrom

Daniel-KM:various_improvements

Jul 18, 2016

Commits on Nov 24, 2015

fix link
patrickmj
committed

Commits on May 15, 2016

Merge branch 'upstream' into various_improvements
Daniel-KM
committed

Commits on Jul 10, 2016