Sync'd branch integration/b2g-inbound with upstream @ Mon Sep 15 10:54:56 PDT 2014