Sync'd branch releases/aurora with upstream @ Fri Oct 10 17:17:35 PDT 2014