Sync'd branch releases/aurora with upstream @ Fri Oct 10 11:04:52 PDT 2014