Merge "conf.py: switched to istanbul" into istanbul