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