Bug fixing: error from automatic report 7/16/2014.
Merge remote-tracking branch 'origin/release-candidate' into release-candidate