Please merge and try for a release candidate.

2014.08 fb 5217 5201