Sync'd branch integration/b2g-inbound with upstream @ Tue Oct 28 14:52:54 PDT 2014