dimitri/el-get — pull request #1689 by yyr (2014-04-09 09:43:13+00:00)
Title: Cherry pick essential commits from 4.stable

I have cherrypicked (3 out 4) commits that are lying around in `4.stable` branch.

Put up PR for the verifications by @npostavs and others Since I had to fiddle around by hand as the merge was mess.