Sync'd branch releases/aurora with upstream @ Tue Sep 16 06:06:34 PDT 2014