Sync'd branch releases/aurora with upstream @ Fri Sep 12 02:33:31 PDT 2014