Merge branch 'master' of https://github.com/satyagraha/gfm_viewer
Merge branch 'master' into develop