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