Modified from my fork
Merge pull request #256 from binochotta/release-2014.2

Modified from my fork