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