Merge remote-tracking branch 'origin/weekly_work' into weekly_work

# Conflicts:
#	doc/examples/example_mining_method.py
3 jobs for weekly_work in 27 minutes and 20 seconds (queued for 3 seconds)