Update from upstream

Added link shortener plugin