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