Sync'd branch releases/aurora with upstream @ Fri Oct  3 09:07:37 PDT 2014