Sync'd branch integration/b2g-inbound with upstream @ Tue Sep 16 13:23:41 PDT 2014