Sync'd branch releases/aurora with upstream @ Fri Sep 19 08:43:44 PDT 2014