merge master
authorimarom <[email protected]>
Thu, 1 Dec 2016 14:52:19 +0000 (16:52 +0200)
committerimarom <[email protected]>
Thu, 1 Dec 2016 14:52:19 +0000 (16:52 +0200)
commit96b2e99823ffcd9701d56cad9de6711c1e4ba14a
treec10b3e00cc891da0cd17bd794814c615eec2739f
parent452e9d470b09513fff00b4a0c3600c33c3e4f76a
parent29163c381f978975b7d328282a46bc93f1a5fa76
merge master

merges an updated upstream into a topic branch.

Signed-off-by: imarom <[email protected]>