antoniop
committed
on 21 Apr 16
Reverting and fixing previous commit, which erroneously brought HEAD version in 5-9 branch