July 2014 review

@BenJanecke @rorymckinley Do one of you two have time to review this PR this morning, pleeeeez? :fish_cake: