Sync'd branch releases/aurora with upstream @ Mon Oct  6 19:49:36 PDT 2014