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