Sync'd branch releases/aurora with upstream @ Wed Oct  8 18:34:42 PDT 2014