commenting out Juan's work - it shouldn't have been committed yet.
commented out too much - oops
Merge remote-tracking branch 'remotes/origin/2014.07.08'