Patch 2

username-removed-1462824 requested to merge github/fork/armetiz/patch-2 into master Sep 11, 2012