Merge 8f9dc7c52dc7f865e417efe8add303e9a04db54b into…

Authored by gibiansky on Aug 14 2015, 4:28 PM.