wkoszek Merge branch 'master' into multios

Latest commit a5e2b8b

Oct 12, 2015