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