Sync'd branch releases/aurora with upstream @ Fri Sep  5 15:01:37 PDT 2014