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