Merging Dev 6.4.0 into master

Merging patch v6.4.0 on aug 12, 2013 into master branch