Merge git://repo.or.cz/isl into 0.13
Merge remote-tracking branch 'sm/master'