Sync'd branch releases/aurora with upstream @ Sun Oct 19 04:16:48 PDT 2014