Merge pull request #1967 from nfedera/fix-2014-07-16-01