Sync'd branch releases/aurora with upstream @ Fri Oct  3 06:17:34 PDT 2014