Sync'd branch releases/aurora with upstream @ Fri Sep 19 04:13:33 PDT 2014