Commit 75db289a041b1f1084768244e167b953ac7eeaa5

Carlos Martín Nieto 2016-12-20T19:14:20

Merge pull request #3980 from tiennou/doc-fixes Documentation fixes