Merge from master
authorHanoh Haim <[email protected]>
Tue, 25 Oct 2016 13:42:29 +0000 (16:42 +0300)
committerHanoh Haim <[email protected]>
Tue, 25 Oct 2016 13:42:29 +0000 (16:42 +0300)

Trivial merge