Changes since 7.x-2.0:
All tested patches have been applied and readied for full release.
Initial release based on the original version (from Shortcode porject)