Sync'd branch releases/aurora with upstream @ Fri Oct 10 14:54:38 PDT 2014