Sync'd branch releases/aurora with upstream @ Sat Oct 11 15:06:40 PDT 2014