Sync'd branch releases/aurora with upstream @ Thu Oct  9 18:28:37 PDT 2014