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