Sync'd branch releases/aurora with upstream @ Sat Oct 18 01:34:44 PDT 2014