Sync'd branch releases/aurora with upstream @ Wed Nov  5 13:36:37 PST 2014