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)
merges an updated upstream into a topic branch.

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

Trivial merge