Sync'd branch integration/b2g-inbound with upstream @ Sat Sep 20 15:18:43 PDT 2014