Merge from master
authorHanoh Haim <[email protected]>
Mon, 18 Apr 2016 10:41:45 +0000 (13:41 +0300)
committerHanoh Haim <[email protected]>
Mon, 18 Apr 2016 10:41:45 +0000 (13:41 +0300)

Trivial merge