Sync'd branch releases/aurora with upstream @ Fri Sep  5 04:47:34 PDT 2014