Sync'd branch releases/aurora with upstream @ Fri Oct 31 14:32:32 PDT 2014