Switched to figure directive
Merge remote-tracking branch 'upstream/master'