Merge from origin
authorHanoh Haim <[email protected]>
Wed, 27 Jan 2016 08:40:04 +0000 (10:40 +0200)
committerHanoh Haim <[email protected]>
Wed, 27 Jan 2016 08:40:04 +0000 (10:40 +0200)

Trivial merge