77346
Merge branch 'master' into Lincor
323514, 323513, 318583, 77347, 323515
27707, 27708, 27709, 27710, 27713, 27716, 27717, 27718, 27719, 27720, 27721, 27722
Merge pull request #18 from Lincor/Lincor

Lincor