Sync'd branch releases/aurora with upstream @ Fri Oct  3 14:46:30 PDT 2014