Sync'd branch releases/aurora with upstream @ Sat Nov  1 21:30:32 PDT 2014