Sync'd branch releases/aurora with upstream @ Fri Oct 10 08:09:36 PDT 2014