Sync'd branch releases/aurora with upstream @ Fri Oct 31 09:00:41 PDT 2014