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