Updated to newer version of plugin.
Merge branch 'upgrade'