Sync'd branch releases/aurora with upstream @ Sat Nov  1 19:05:33 PDT 2014