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