Sync'd branch releases/aurora with upstream @ Fri Oct 31 17:22:54 PDT 2014