Fixing merge 20130715