Sync'd branch releases/aurora with upstream @ Fri Oct 24 05:19:40 PDT 2014