Sync'd branch releases/aurora with upstream @ Sat Oct 11 05:34:20 PDT 2014