Sync'd branch releases/aurora with upstream @ Sat Oct 18 03:19:42 PDT 2014