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