Revert "Revert "2014-07-04""

This reverts commit c9d98f207db5ddc46f98e792d9c7cf58596ac239.