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