Sync'd branch releases/aurora with upstream @ Wed Sep 10 03:23:32 PDT 2014