Merged default branch
gtkdoc-conversion
2014-02-06, Ankit Vani