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