Merge branches 'doc.2015.07.15a' and 'torture.2015.07.15a' into HEAD doc.2015.07.15a: Documentation updates. torture.2015.07.15a: Torture-test updates.