Merge pull request #331 from s0undt3ch/stable

Merge stable for v2014.02.27