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