Sync'd branch releases/aurora with upstream @ Wed Oct  8 05:58:40 PDT 2014