Sync'd branch integration/b2g-inbound with upstream @ Tue Oct 28 19:34:15 PDT 2014