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