Sync'd branch releases/aurora with upstream @ Wed Oct  8 14:17:49 PDT 2014