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