Sync'd branch releases/aurora with upstream @ Tue Sep 30 06:39:33 PDT 2014