merged rel_201408
Merge branch 'rel_201408', which just merged master, since roqua release branch was using a very late master commit anyways.