Sync'd branch releases/aurora with upstream @ Fri Sep 12 09:56:32 PDT 2014