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