Sync'd branch releases/aurora with upstream @ Mon Sep 15 21:31:32 PDT 2014