Merge remote-tracking branch 'origin/develop' # Conflicts: # .doctrees/auxiliary/comm.doctree # .doctrees/auxiliary/environment.doctree # .doctrees/auxiliary/index.doctree # .doctrees/basicusage.doctree # .doctrees/cli.doctree # .doctrees/environment.pickle # .doctrees/index.doctree # .doctrees/installing.doctree # .doctrees/modules/autofocus/index.doctree # .doctrees/modules/autofocus/projection.doctree # .doctrees/modules/autoguiding/index.doctree # .doctrees/modules/autoguiding/projection.doctree # .doctrees/modules/camera/basecamera.doctree # .doctrees/modules/camera/dummycamera.doctree # .doctrees/modules/camera/index.doctree # .doctrees/modules/filecache/http.doctree # .doctrees/modules/filecache/index.doctree # .doctrees/modules/imagedb/imagedb.doctree # .doctrees/modules/imagedb/index.doctree # .doctrees/modules/imagedb/newimagewatcher.doctree # .doctrees/modules/imagedb/newimagewriter.doctree # .doctrees/modules/index.doctree # .doctrees/modules/proxy/http2xmpp.doctree # .doctrees/modules/proxy/index.doctree # .doctrees/modules/roof/baseroof.doctree # .doctrees/modules/roof/dummyroof.doctree # .doctrees/modules/roof/index.doctree # .doctrees/modules/telescope/basetelescope.doctree # .doctrees/modules/telescope/dummytelescope.doctree # .doctrees/modules/telescope/index.doctree # .doctrees/modules/test/index.doctree # .doctrees/modules/test/standalone.doctree # .doctrees/quickstart.doctree # _sources/modules/index.rst.txt # _static/basic.css # _static/css/badge_only.css # _static/css/theme.css # _static/doctools.js # _static/documentation_options.js # _static/js/theme.js # _static/searchtools.js # _static/websupport.js # auxiliary/comm.html # auxiliary/environment.html # auxiliary/index.html # basicusage.html # cli.html # genindex.html # index.html # installing.html # modules/index.html # objects.inv # quickstart.html # search.html # searchindex.js