Delayed feature from 8 months ago;

Some previous discussion:

https://news.ycombinator.com/item?id=45698930