Merge pull request #1836 from sigmavirus24/2014