Merge pull request #315 from s0undt3ch/stable

Merge current develop branch into Stable for 2014.02.16